From: Colin Walters Date: Tue, 24 Jun 2025 20:29:45 +0000 (-0400) Subject: prepare-root: Move metadata for root transient into lib X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~4^2~17^2~1 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=70296be26894c342cb3d0a6757b414cb631e7bb5;p=ostree.git prepare-root: Move metadata for root transient into lib Prep for soft reboots. Signed-off-by: Colin Walters --- diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c index a82e16d2..3efdf576 100644 --- a/src/libotcore/otcore-prepare-root.c +++ b/src/libotcore/otcore-prepare-root.c @@ -377,6 +377,10 @@ otcore_mount_rootfs (ComposefsConfig *composefs_config, GVariantBuilder *metadat g_variant_builder_add (metadata_builder, "{sv}", OTCORE_RUN_BOOTED_KEY_BACKING_ROOTDEVINO, g_variant_new ("(tt)", (guint64)stbuf.st_dev, (guint64)stbuf.st_ino)); + /* Pass on the state */ + g_variant_builder_add (metadata_builder, "{sv}", OTCORE_RUN_BOOTED_KEY_ROOT_TRANSIENT, + g_variant_new_boolean (root_transient)); + bool using_composefs = FALSE; #ifdef HAVE_COMPOSEFS /* We construct the new sysroot in /sysroot.tmp, which is either the composefs diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index fb38f095..7f350412 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -281,10 +281,6 @@ main (int argc, char *argv[]) err (EXIT_FAILURE, "failed to make initial bind mount %s", deploy_path); } - /* Pass on the state */ - g_variant_builder_add (&metadata_builder, "{sv}", OTCORE_RUN_BOOTED_KEY_ROOT_TRANSIENT, - g_variant_new_boolean (root_transient)); - /* Pass on the state for use by ostree-prepare-root */ g_variant_builder_add (&metadata_builder, "{sv}", OTCORE_RUN_BOOTED_KEY_SYSROOT_RO, g_variant_new_boolean (sysroot_readonly));